From: Florian Müllner Date: Mon, 9 Mar 2020 00:59:09 +0000 (+0100) Subject: extensionPrefs: Fake Config module X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~751^2^2~28 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=ed21a4e5c18211bbcc1bed8e2731463ab815e1cb;p=gnome-shell.git extensionPrefs: Fake Config module We include config.js because it is a dependency of ExtensionUtils, but it's not actually used in the code paths we exercise. As we want to allow stand-alone builds of the app, it is much easier to fake the module than to either include a generated file from elsewhere in the tree or generate it ourselves. https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1133 --- diff --git a/js/extensionPrefs/js/meson.build b/js/extensionPrefs/js/meson.build index 56687bf6c..97e568d7c 100644 --- a/js/extensionPrefs/js/meson.build +++ b/js/extensionPrefs/js/meson.build @@ -22,13 +22,10 @@ configure_file( install_dir: pkgdatadir, ) -config_dir = '@0@/../..'.format(meson.current_build_dir()) - gnome.compile_resources( app_id + '.src', app_id + '.src.gresource.xml', - dependencies: [config_js], - source_dir: ['.', '../..', config_dir], + source_dir: ['.', '../..'], gresource_bundle: true, install: true, install_dir: pkgdatadir diff --git a/js/extensionPrefs/js/misc/config.js b/js/extensionPrefs/js/misc/config.js new file mode 100644 index 000000000..d213b7825 --- /dev/null +++ b/js/extensionPrefs/js/misc/config.js @@ -0,0 +1 @@ +/* Fake module to satify import in ExtensionUtils */